3 files fixed
#lmprs-5 fixed tag to be tested