Different Spec tests

I noticed you already wrote the spec tests by the time I finished. :P 

I did write mine a bit differently so I thought I would put in a PR anyway to see if you would want to use anything from my version in yours.