Problem solved 50% (no unit test).
Problem 2 solved.