Cast to int as well as updated tests