Move testing to top level
Add Layout to eventually be used for Excel output