cleaned some tests