Added message property and tests