fixed tests problems, ready to autogen