major update before completely new setup
minor update in Test.cpp