Improve tests

Trying to collaborate a bit with #4334 

* replace asserts with rspec equivalents
* remove unused specs

review is welcome, 
I'll try to work a bit more on that PR