Unit Tests and controller modified - rmlp