Upped the unit test to be more comprehensive