Moved lexical-scopes test to similar layout as block-scopes