fixed few tests