fixing up tests and allowing message text