Change tests
Move callback tests to separate file
Changed some C/XS
More callback tests
Fix indentation
Add vertical spacing