Additional sandboxing and tests for sandboxing