Code

fixes to unit tests for recent changes