New test added
Clean up code
Updates Comments