Rework of the case change part with better tests, fewer lines of code and one more test case that is working