changes as per review comments and added a test to remove product