Better tests (are valid :D)