Unit-testing for data structures and numerics cleaned up.