Added tests for the system controller