Improve testing and change rendere behavior