Corrected error that mis-calculated spans across midnight. Only worked for "today". Plus added a couple of tests.