Fixed mvc/Util vs. util/Util problem in tests