Fixes for utilities tests (all pass)