Added scope and messages tests