Added tests for excedption cases, refactored duplicate code, updated proximity with question in column case.