More structure in Tests.hs