Working on getting the tests updated