95% done. Remaining tests