Added Test and Code Coverage