Increased Test Code coverage, improved naming and comments.