rework abandoned tests to avoid inheritence