first stab at fixing up the tests