remove callback from delay and fix tests

Fix for #4