Integrated more Messages into tests.