fix tests by using throughout
release 2.1.3