Clean up the unit tests a bit... some fail still