Messages renamed
Test added