some cleanup on the demo object and more tests