Updated builder to be aware of message text
Updated some test cases to reflect this
#72