changed tests to reflect new structure
more spec fixes
Merge pull request #17 from celeen/backend

Backend