Magic numbers are gone, tests grew a tiny bit