Improved test readability + fixed integer divison