update sketch
merge
deal with a single test correctly
the swap button now works