added setup and cleanup in tests