add unit test for DisplayContainer/Controller + cleanups