Fix the unit test
Get some tests passing...