refined test and deactivated new failing tests