Almost there... test 6 & 7 left

With possible debugging aswell...