AUT: Refactoring (removing data from code into Param Object), lots more
to due.