Made changes based on testing with dworklight-testapp