Fix #620: Sanitize TestFramework (proper naming & access to tests)
Merge pull request #621 from gzm0/test-framework

Fix #620: Sanitize TestFramework (proper naming & access to tests)