Added more tests and corrected some serious bugs, the countries parameter handling was b0rken