Added comments for custom tests, updated types for c_swi_handler