[WIP] - go back test suite
Test from scratch. Only rspec