Test fixes, all pass