Library fixes

Fixed minor problems with use of library provided test cases.