Test2 is done and major errors fixed