Getting ready for more data logging tests
Testing multiplexer
Merge pull request #21 from rkevingibson/master

Created multiplexer test, and fixed other minor mistakes.