Additional Test Cases, Code Clean Up