fix test method name
minor code cleanups
prepare moving the Demo language to the test package
simplify test code