Refactored table types
Removed need for test.gba