Added message builder tests and extra asserts