Improved standalone test command