re: Cmd tests timeout and splitting tests