Added initial Controlelrs and tests