Fixes to unit tests