Added related tests and removed coverage support