P06 done, changed tests