Fixing bug in test infrastructure;  All unit tests now pass