Indentation tidyup.
Moved model loading into test class.