Updates according to tests
Got rid of YML to a JSON conf instead