Update unit tests for Solver