nuke mocked specs.
specs rearranged
Merge pull request #22 from ranjib/cleanup_specs

Cleanup specs