Add test cases to establish baseline. #338
Fix tabs
Initial attempt of adding location data for tokens (untested). #338