migrate to rspec and clean up
Merge remote-tracking branch 'origin/develop' into develop