Make no assumptions about when NormalTest is run!
Fix indentation (well, sort of).
This finally seems to do the job!

CppUTestExt tests still hanging for some reason.