Feature/improve tests