cake pattern together with unit test is complete
fix conflicts