Added KeepPosition controller with tests