12 solved
Solved 13
Fix unit test for 13
Solved 14