Refactored message building
Fixed some integration tests
emoji love