Merge "Add some tests back which were removed for fixing kotlin nullable errors" into main