Remove uneeded file, function
Fixes tests, adds testing for setting of callbacks