Fixes to Test units