Use "describe" blocks where appropriate

Clean-up/re-organize the tests a bit by using "describe" blocks to section off the methods being tested