Tests ported and passed