Return nil for booleans instead of raising exceptions
Add everything back to get travis working and clean up commented out items
Alphabetizing test variables