Major test reshuffling. Keep things smaller dummy