UNCLASSIFIED - NO CUI
Fixed table tests so they are passing and added additional checks as described by TODOs