Fixed Actor test and did a few smaller changes.