Rounding and slightly better tests