First pass at fixing the tests