Add new test.
Create combined test.
Fix old test.
Merge pull request #32 from LightUpInc/add-merged-test

Add merged test