Fixed more specs
Removed spec
Fixed most of the specs. Marked failing ones a pending