many changes to make the test environment more to a one-click-solution