Re-worked a test.
Testing, bug fixing, same old, same old...