Cleanup
add rspec helpers