Testing issue tracking

#ANDSMP-2 fixed