Added coverage and added more tests