Feature/refactor spec