[OLINGO-733] Code clean up and more tests
10 files changed