Fixed tests and rules