diff --git a/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/intermediate-algorithm-scripting/make-a-person.md b/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/intermediate-algorithm-scripting/make-a-person.md
index eae72469d86..abb3511513e 100644
--- a/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/intermediate-algorithm-scripting/make-a-person.md
+++ b/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/intermediate-algorithm-scripting/make-a-person.md
@@ -16,160 +16,166 @@ getLastName()
 getFullName()
 setFirstName(first)
 setLastName(last)
-setFullName(firstAndLast)
+setFullName(first, last)
 ```
 
-Run the tests to see the expected output for each method. The methods that take an argument must accept only one argument and it has to be a string. These methods must be the only available means of interacting with the object.
+Run the tests to see the expected output for each method. These methods must be the only available means of interacting with the object. Each test will declare a new `Person` instance as `new Person('Bob', 'Ross')`.
 
 # --hints--
 
-No properties should be added. `Object.keys(bob).length` should always return 6.
+You should not change the function signature.
 
 ```js
-assert.strictEqual(
-  Object.keys((function () {
-    let bob = new Person('Bob Ross');
-    bob.setFirstName('Haskell');
-    bob.setLastName('Curry');
-    bob.setFullName('John Smith');
-    return bob;
-  })()).length,
-  6
- );
+assert.match(code, /const\s+Person\s*=\s*function\s*\(\s*first\s*,\s*last\s*\)\s*{/);
 ```
 
-`bob instanceof Person` should return `true`.
+You should not reassign the `first` parameter.
 
 ```js
-assert.deepEqual(_test_bob instanceof Person, true);
+assert.notMatch(code, /first\s*=\s*/);
 ```
 
-`bob.firstName` should return `undefined`.
+You should not reassign the `last` parameter.
 
 ```js
-assert.deepEqual(_test_bob.firstName, undefined);
+assert.notMatch(code, /last\s*=\s*/);
 ```
 
-`bob.lastName` should return `undefined`.
+No properties should be added. `Object.keys(Person).length` should always return 6.
 
 ```js
-assert.deepEqual(_test_bob.lastName, undefined);
+const person = new Person('Bob', 'Ross');
+person.setFirstName('Haskell');
+person.setLastName('Curry');
+person.setFullName('John', 'Smith');
+assert.lengthOf(Object.keys(person), 6);
 ```
 
-`bob.getFirstName()` should return the string `Bob`.
+You should be able to instantiate your `Person` object.
 
 ```js
-assert.deepEqual(_test_bob.getFirstName(), 'Bob');
+const person = new Person('Bob', 'Ross');
+assert.instanceOf(person, Person);
 ```
 
-`bob.getLastName()` should return the string `Ross`.
+Your `Person` object should not have a `firstName` property.
 
 ```js
-assert.deepEqual(_test_bob.getLastName(), 'Ross');
+const person = new Person('Bob', 'Ross');
+assert.notProperty(person, 'firstName');
 ```
 
-`bob.getFullName()` should return the string `Bob Ross`.
+Your `Person` object should not have a `lastName` property.
 
 ```js
-assert.deepEqual(_test_bob.getFullName(), 'Bob Ross');
+const person = new Person('Bob', 'Ross');
+assert.notProperty(person, 'lastName');
 ```
 
-`bob.getFullName()` should return the string `Haskell Ross` after `bob.setFirstName("Haskell")`.
+The `.getFirstName()` method should return the string `Bob`.
 
 ```js
-assert.strictEqual(
-  (function () {
-    _test_bob.setFirstName('Haskell');
-    return _test_bob.getFullName();
-  })(),
-  'Haskell Ross'
-);
+const person = new Person('Bob', 'Ross');
+assert.strictEqual(person.getFirstName(), 'Bob');
 ```
 
-`bob.getFullName()` should return the string `Haskell Curry` after `bob.setLastName("Curry")`.
+The `.getLastName()` should return the string `Ross`.
 
 ```js
-assert.strictEqual(
-  (function () {
-    var _bob = new Person('Haskell Ross');
-    _bob.setLastName('Curry');
-    return _bob.getFullName();
-  })(),
-  'Haskell Curry'
-);
+const person = new Person('Bob', 'Ross');
+assert.strictEqual(person.getLastName(), 'Ross');
 ```
 
-`bob.getFullName()` should return the string `Haskell Curry` after `bob.setFullName("Haskell Curry")`.
+The `.getFullName()` method should return the string `Bob Ross`.
 
 ```js
-assert.strictEqual(
-  (function () {
-    _test_bob.setFullName('Haskell Curry');
-    return _test_bob.getFullName();
-  })(),
-  'Haskell Curry'
-);
+const person = new Person('Bob', 'Ross');
+assert.strictEqual(person.getFullName(), 'Bob Ross');
 ```
 
-`bob.getFirstName()` should return the string `Haskell` after `bob.setFullName("Haskell Curry")`.
+The `.getFullName()` method should return the string `Haskell Ross` after calling `.setFirstName('Haskell')`.
 
 ```js
-assert.strictEqual(
-  (function () {
-    _test_bob.setFullName('Haskell Curry');
-    return _test_bob.getFirstName();
-  })(),
-  'Haskell'
-);
+const person = new Person('Bob', 'Ross');
+person.setFirstName('Haskell');
+assert.strictEqual(person.getFullName(), 'Haskell Ross');
 ```
 
-`bob.getLastName()` should return the string `Curry` after `bob.setFullName("Haskell Curry")`.
+The `.getFullName()` method should return the string `Bob Curry` after calling `.setLastName('Curry')`.
 
 ```js
-assert.strictEqual(
-  (function () {
-    _test_bob.setFullName('Haskell Curry');
-    return _test_bob.getLastName();
-  })(),
-  'Curry'
-);
+const person = new Person('Bob', 'Ross');
+person.setLastName('Curry');
+assert.strictEqual(person.getFullName(), 'Bob Curry');
+```
+
+The `.getFullName()` method should return the string `Haskell Curry` after calling `.setFullName('Haskell', 'Curry')`.
+
+```js
+const person = new Person('Bob', 'Ross');
+person.setFullName('Haskell', 'Curry');
+assert.strictEqual(person.getFullName(), 'Haskell Curry');
+```
+
+The `.getFirstName()` method should return the string `Haskell` after calling `.setFullName('Haskell', 'Curry')`.
+
+```js
+const person = new Person('Bob', 'Ross');
+person.setFullName('Haskell', 'Curry');
+assert.strictEqual(person.getFirstName(), 'Haskell');
+```
+
+The `.getLastName()` method should return the string `Curry` after calling `.setFullName('Haskell', 'Curry')`.
+
+```js
+const person = new Person('Bob', 'Ross');
+person.setFullName('Haskell', 'Curry');
+assert.strictEqual(person.getLastName(), 'Curry');
+```
+
+The `.getFullName()` method should return the string `Emily Martinez de la Rosa` after calling `.setFullName('Emily Martinez', 'de la Rosa')`.
+
+```js
+const person = new Person('Bob', 'Ross');
+person.setFullName('Emily Martinez', 'de la Rosa');
+assert.strictEqual(person.getFullName(), 'Emily Martinez de la Rosa');
+```
+
+The `.getFirstName()` property should return the string `Emily Martinez` after calling `.setFullName('Emily Martinez', 'de la Rosa')`.
+
+```js
+const person = new Person('Bob', 'Ross');
+person.setFullName('Emily Martinez', 'de la Rosa');
+assert.strictEqual(person.getFirstName(), 'Emily Martinez');
+```
+
+The `.getLastName()` property should return the string `de la Rosa` after calling `.setFullName('Emily Martinez', 'de la Rosa')`.
+
+```js
+const person = new Person('Bob', 'Ross');
+person.setFullName('Emily Martinez', 'de la Rosa');
+assert.strictEqual(person.getLastName(), 'de la Rosa');
 ```
 
 # --seed--
 
-## --after-user-code--
-
-```js
-const _test_bob = new Person('Bob Ross');
-```
-
 ## --seed-contents--
 
 ```js
-const Person = function(firstAndLast) {
+const Person = function(first, last) {
   this.getFullName = function() {
     return "";
   };
-  return firstAndLast;
+  return "";
 };
-
-const bob = new Person('Bob Ross');
-bob.getFullName();
 ```
 
 # --solutions--
 
 ```js
-const Person = function(firstAndLast) {
-
-  let firstName, lastName;
-
-  function updateName(str) {
-    firstName = str.split(" ")[0];
-    lastName = str.split(" ")[1];
-  }
-
-  updateName(firstAndLast);
+const Person = function(first, last) {
+  let firstName = first;
+  let lastName = last;
 
   this.getFirstName = function(){
     return firstName;
@@ -192,11 +198,9 @@ const Person = function(firstAndLast) {
     lastName = str;
   };
 
-  this.setFullName = function(str){
-    updateName(str);
+  this.setFullName = function(first, last){
+    firstName = first;
+    lastName = last;
   };
 };
-
-const bob = new Person('Bob Ross');
-bob.getFullName();
 ```