Added tests and basic controllers