Added NZ holiday types & method (#2); fixed JP holiday test file