Fix tests; add more