Changed command names and added test command