extended test suite + cleanp