added changes for fixes to get unit tests to work