Reorganize specs so that rspec works properly