Trying to get the tests to work..  :(