Adding tests for new yaml parsing stuff and adjusting imports