demo removed, tests implemented