Improved tests to null test all functions and have a fancy output with helpful information. Renamed a function. Updated the null check to be more compact
Merge remote-tracking branch 'origin/master'