Move tests into a possible good structure