added a ReTest class and moved some header files about