change tests, add new rules