Finish amending KM tests