Fix few tests