Simplify directory structure
Run test suite against foreman
Force rspec expect syntax