All fixed.
By Geoff and Michael

Fixed, tested. All good.
The tutorial module names included dashes, this conflicted with the import
statements. Also, I forgot to remove one of the rules page tests.