Table and mapping testing updates