[feature/tests] Undo some changes... no more required