use es-class instead of uberproto
minor touch ups
fix base-service tests