small change of direction, started updating the tests