Fixed the tests to stay more true to the old tests, while accurately test the new stuff.