Fixed Message & MessageTest errors