Added testing capabilites to demoer