Fixing test.
Refactoring and fixing the double koordinates bug.