Cleanup, adding test for demo