Callback tests and other tidying up done