add some functions + change namespace (for test framework)