fix unit tests and start to improve Combine.