fix test model name to prevent conflict, import modules in alphabetical
order, remove nasty whitespace #1