integrated implicit flow support into the solver
cleaned up code and fixed merging issue
improved test cases and added a missing source for test evaluation