Moved Test:* commands to separate file