Fixing issue with context manager. All tests passing.