cleaning up
added new specs
new specs -- waiting for test cases
Merge branch 'rspec'