Extended Solver unit tests
Performance improvements