adds NSNumber handling
adds additional unit tests