some renaming and added a copy of the test to parallel