Minor changes
Improve table tests