Tests cleaned up, old tests are still TestNg tests but renmaed to *Demo
to prevent surefire running them.