Updated tests to work with 6e58bdd