Add first scope and tests