diff --git a/packages/functional-tests/src/test.ts b/packages/functional-tests/src/test.ts
index d5aff56f9..d56e83ae7 100644
--- a/packages/functional-tests/src/test.ts
+++ b/packages/functional-tests/src/test.ts
@@ -71,7 +71,8 @@ export abstract class Test {
 
 	public checkPermission(user: User) {
 		if (this.modsOnly) {
-			if (!/moderator|presenter/u.test(user.properties['altspacevr-roles'])) {
+			if (user.properties['altspacevr-roles']
+				&& !/moderator|presenter/u.test(user.properties['altspacevr-roles'])) {
 				throw new Error('Only moderators can run this test');
 			} else {
 				console.log(`User ${user.name} allowed to start test`);
diff --git a/packages/functional-tests/src/tests/collision-layer-test.ts b/packages/functional-tests/src/tests/collision-layer-test.ts
index 9009f11df..5d2a8d860 100644
--- a/packages/functional-tests/src/tests/collision-layer-test.ts
+++ b/packages/functional-tests/src/tests/collision-layer-test.ts
@@ -83,15 +83,15 @@ export default class CollisionLayerTest extends Test {
 	}
 
 	private createWidget(root: MRE.Actor, layer1: MRE.CollisionLayer, layer2: MRE.CollisionLayer) {
-		const ballMesh = this.assets.meshes[0]
+		const ballMesh = this.assets.meshes.find(m => m.name === 'ball')
 			|| this.assets.createSphereMesh('ball', 0.05);
-		const boxMesh = this.assets.meshes[1]
+		const boxMesh = this.assets.meshes.find(m => m.name === 'box')
 			|| this.assets.createBoxMesh('box', 0.1, 0.1, 0.1);
-		const ballMat = this.assets.materials[0]
+		const ballMat = this.assets.materials.find(m => m.name === 'ball')
 			|| this.assets.createMaterial('ball', { color: MRE.Color3.LightGray() });
-		const boxDefaultMat = this.assets.materials[1]
+		const boxDefaultMat = this.assets.materials.find(m => m.name === 'boxDefault')
 			|| this.assets.createMaterial('boxDefault', { color: MRE.Color3.LightGray().toColor4(0.5) });
-		const boxHitMat = this.assets.materials[2]
+		const boxHitMat = this.assets.materials.find(m => m.name === 'boxHit')
 			|| this.assets.createMaterial('boxHit', { color: MRE.Color3.Red().toColor4(0.5) });
 
 		const box = MRE.Actor.Create(this.app.context, {