refactor controller lamp and updated tests
Merge branch 'master' into testing
Merge pull request #56 from ChaeOkay/testing

Testing