Corrections based on  previous comments by @joshaber. Changed tests to include NSNull conversion testing.