Made tests pass or SKIP'd ones that can't pass