Added tests for Controller; switched Controller ID to Int from String