Added tests for Convenience::#fire, and refactored corresponding flow a bit