Revert "Fix timeperiod tests" : Was on bas branch..

This reverts commit 50380106e674dc1661e8adb9ca3e9339bf42febc.