change tests, add rules