Move everything from test to spec