several tests fixed