Simple clock added, 'test' changed into module