Fixed some issues with the test output, actual demo version.