Removed derp test files
Fix command names conflicting