small fix.
Major fix for a time guards.
More tests.
More tests.