Minor adjustments to CML parsing, testing

- Slightly adjusted the way I build CML files so that it makes more
sense
- Adjusted the test_CML to reflect that
- Added initial support for using CML files with main.,py