Add in unit tests for controls