refactoring based on code review comments
move history tests under first set of controller tests