Added some Utilities tests; some cleanup