Fixes some null checks and updates a member test