Added some more unit tests on some of the controls.