add back most tests