Modified test template and SQL schema