Added additional unit-testing. Removed unnecessary method. Commented out debugging information.