More test setup
remove demo tests