Refactored tests to use describe/it

Turns out that I've rather got used to being able to nest things
within the scope of describe blocks for the use of the block's
tests.