Made tests more consistent with real life scenario
Removed finalize method