fixes, launcher and test method