Add tests
Move specs to spec/