Even more tests ported