More testing stuff; also I've got to remember to use -m to add messages!