P06 solved, tests modified
P10 solved and tested