Remove test and use purely rspec [WIP]