                 expect(manager!.getNicknameForEntity(e1)).to(beNil())
             }
 
+            // TODO test that delete (1) removes components and (2) frees nickname
+
             // ------------------------------
             // MARK: - Components
 
-
-            describe ("its set()/get() methods") {
+            describe ("its set/get methods") {
                 it ("should set/get a component") {
                     let entity = manager!.newEntity()
                     let component = SomeComponent(0)
-                    manager!.setComponent(component, entity: entity)
-                    expect(manager!.getComponentOfType(SomeComponent.self, entity: entity)).to(beIdenticalTo(component))
-                }
-            }
-
-            describe ("its set() method") {
+                    manager!.setComponent(component, forEntity: entity)
+                    expect(manager!.getComponentOfType(SomeComponent.self, forEntity: entity)).to(beIdenticalTo(component))
+                }
+            }
+
+            describe ("its set method") {
                 it ("should replace existing components") {
                     let entity = manager!.newEntity()
                     let component0 = SomeComponent(0)
                     let component1 = SomeComponent(1)
 
-                    manager!.setComponent(component0, entity: entity)
-                    manager!.setComponent(component1, entity: entity)
-
-                    let actual = manager!.getComponentOfType(SomeComponent.self, entity: entity)
+                    manager!.setComponent(component0, forEntity: entity)
+                    manager!.setComponent(component1, forEntity: entity)
+
+                    let actual = manager!.getComponentOfType(SomeComponent.self, forEntity: entity)
                     expect(actual).to(beIdenticalTo(component1))
                 }
 

        //      mgr.set(e1, e)
        //    }) should produce[IllegalArgumentException]
        //  }
        //
        //  "get()" should "return None for unset components" in { mgr =>
        //    val e = mgr.newEntity()
        //    mgr.get[SomeComponent](e) should be(None)
        //  }
        //
        //  "has()" should "return true for set components" in { mgr =>
        //    val e = mgr.newEntity()
        //    val c = SomeComponent(0)

        //    val e = mgr.newEntity()
        //    mgr.has[SomeComponent](e) should be(false)
        //  }

            describe ("its remove method") {
                it ("should remove components") {
                    let entity = manager!.newEntity()
                    let component = SomeComponent(0)
                    manager!.setComponent(component, forEntity: entity)
                    manager!.removeComponentOfType(SomeComponent.self, forEntity: entity)
                    expect(manager!.getComponentOfType(SomeComponent.self, forEntity: entity)).to(beNil())
                }
            }

        //  "remove()" should "return previous value for set component" in { mgr =>
        //    val e = mgr.newEntity()
        //    val c = SomeComponent(0)
