Added tearDown and some test methods