Adding progress, still not fixed.

In the process of making the tests not re-use what should be a function.
Testing the function on the simplest test case before moving on to the more
complex tests.