Fix edge cases and untested logic, add skeleton mtlOptions tests