Fixed some serious bugs, got up to test 6 working.

Print statements still a bit wonky, but the end is nigh.