Update tests and Commands