Add type variable for innodb/myisam focus, extend sample size to 16GB