Add standalone test