Fixed unresolved method error by adjusting exports. Added some more tests for 'with'.