refactoring, Renderer implementation, adapt tests