Upgraded code & spec files to reach 100% coverage.