fixed tests....