Ported some more tests. Ignoring those failing for now.