Andrew's suggestions and tests