Added translation table test
More template
Clean up template