Add unit tests and bug fixes to known sets