Adjusted tests (not finished yet)