New rules broke tests - fixed