Ported more tests to rspec new syntax
Refactored more tests