Improve testing and remove unnecessary calls