Fixing build. I've also tweaked Utilities test to improve running time.