Tests seems to be fixed and refactored self into other names