fix lamp feature test. TESTS ALL GREEN!
Merge branch 'master' into testing
Merge pull request #54 from ChaeOkay/testing

Testing