SOR test implemented and some clean up done