Added tests from @arstrube
Fixed formatting and naming inconsistencies