Replaced demo tester with our own