Moved more tests over to ut11 format