Added tests to the last four controls