Formatting
Adds configurable inference to test case
Updates test cases