Upgrade packages
Dont choke on missing start, end seconds
Fix tests