Fixes tests issues and styling
Adds simple scope