Moved Demo code to Test, removed some unused code.