Merge pull request #53 from ChaeOkay/testing

Testing
fix lamp feature test. TESTS ALL GREEN!
Merge branch 'master' into testing