Added tests for Canada in and out of area, some small organizational tweaks