Ported tests to use new perty