Working on ring bug fixes and unit tests