Changes in Messages and test files