cleanup, move demo_output to test dir