Merge some test cleanup.
Cleaned some table lookups and added relevant strictness