Fixed test signature
Merge branch 'dev' into testing
Fixing tests
Fixing tests
Fixed tests
Fixing message trimming test
Merge branch 'dev' into testing