Moved over to new format, but RLP tests still need updating.
Updated the tests.