Getting things working on Windows again. Closes #21.
Tidying up bootstrap tests.