Tests refactoring, MessagePage added