More handler tests and added safe wrappers.