Improve table test