Simplified data calculation.

Added some missing tests around time changes to ensure that limits times
are being properly calculated.