Cleaned up Util unit tests, still need work