add asserts to ModelServiceIT
add and improve some javadocs
fix DataStoreService tests