Cleaned up specs
Removed todo
Changed spec