Added many more tests, support alternate YAML-style syntax