remove standard layout and more rspec tests