Changes according Dominic's review notes and more callback tests