Moved notice test around