Fix all remaining tests
Remove the fucntional integration from the solver