Test fixes, make them all pass