Added more tests, removed disposeAll from example where redundant