This pull request adds to our testing + fixes some general foodcritic errors