1 2 stable test fixes

Clean up and test fixes.