added unique paramater
finished up with requeue
cleaned up lots of things in the rspec file