Added tests and put display controller tests into separate class.