Fix tests and commands