more, but minor renaming
moved commands out into seperate files
fixed issue when running multiple tests in parallell