re-added tests.  one is still failing