add returns where necessary and proper
update editorconfig for psr support
First attempt at adding tests