moved test actors to one file; increment counters appropriately when sampling; Changed spec comments'