Clean up code in Testing.hs