Fix time regex
Add time-to-empty and time-to-full
Update tests