CARE #18: Created a new indicator service unit test; fixed a few minor issues