Test cleanup 652

Fixes all tests so they pass.