[OLINGO-62] Refactor overloading and more tests