Fixed sycning weirdness

Github did some craziness on that last push, pretty sure I fixed it.
Also put Viv's test case in as 6, and fixed some typos I caused with
overzealous find + replace all.