review comments; added tests