Fixed #1 and updated tests

The Demo app still needs work, but the noise seems to work now.