Finished work on Comparison Extension and tests