Changed the tests to reflect our own little world