Fix require bug in unit tests
Reduce number of callbacks