* Add null checks for empty datatypes in api/query responses * Add jest cases for failing tests * Add one more test case