scheduling calculation + fixed tests and schema generation