Fixed Countries class and added test