(Discussions) Clear issues with a couple unit tests. Fixed and stable.