Refactor test names
Add callback wrapper test