Actor modifications and test case fixes