Fixed three tests