Test correction and various clean up