Fix AS instances to use table, add test.