Fix variable scoping
Additional tests for minutes/seconds