#MNTA-1 Fixed testing