Adds tests and reformats
Quick fix to testing
Fixes merge conflicts