Update mysql queries to spec
Fix use of default test parameters