Made changes based on comments and added a test