2 more fixed tests