1 2 stable test fixes

Some general clean up and passing tests!