Get test 11 & 12 working