Improved unit test framework, removed exposed functionality