Added test cases, changed test schema