Rename cluster to aggregate, cleanup dirty tests

Signed-off-by: Kirill Enykeev <enykeev@gmail.com>