Test suite fixes

My work on getting test suite to pass.