Added coverage testing..