Fixes to unit tests improving style and effectiveness