updated some service asserts and tests