improve test coverage, drop shoulda dependancy