Improved creating test table