changed message related stuff, changed test to reflect this as well
Merge branch 'master' of https://github.com/arendu/MLCD-Assignment2