Better rim data. Amended unit tests.