first set of minor fixes, modification of tests schema