fixed redundancy
beautified syntax
Removed pending, tests passing
added country relation