Started refactoring feasibility solver
Adding more test cases