Fix for clock_tests
Merge pull request #956 from AndreiH/fix_clock_2

Fix for clock_tests