some tidying up
Merge branch 'master' of github.com:NICTA/course
imports for tests