Extend and refactor unit tests for new non static Api