Added legitimate_user field to user disregard test/service and admin users when
aggregating data