More tests, fixing a bug with 'effectively int' parameter types