Bugfixes and circular tests
Minor tweaks