Several tests pass again =)