removed a duplicate test, cleaned up some others

I came across a duplicate test and changed some stuff to the new rspec syntax while I was at it.