Move tests to spec/features