Fixed tearDown in unit tests