The convertNulls() method was not being called
Added a call to it, and removed some redundant code from the prepareQuery() method that previously handled nulls
Also updated the test cases for nulls