Split into src and test, extract Solution to give a piss-poor dynamic namespace