Total count and distinct implemented, tests passing