removed old datasource
updated tests and severity mapping