Use integers for  and fix tests