Partial progress on improving tests #12