More tests, and fix integer floor division