Changed class to better describe control functionality
All tests fixed