Add tests for 09380b67