Some updates have been made to the spec since implementation. Keep up with those, implement and test.