More fixes to tests; also added TODO tests