Added new tested cases and completed coberture.