unit test fixes and additions