Improved unit test based off John's recommendation