Added coverage; removed unnecessary plugins
Minor refactorings