#492: change tests and rules