refactored tests and removed categories
update to spec