Added mixed solution solver, test cases, boundary conditions, and row/column swap support