Don't create Badge and Expiry key when None value
Mod tests
Fix #1 Add priority field