Unit tests working for both high and low.  Some renames in order.