Switched to Rspec for tests
More useless changes