Started adding tests, need to create more command mappings