Minimized build SQLs + test SQLs added