More test refactoring. Now with subdirs and without the test. prefix.
Using assert.deepEqual in tests instead of a custom function.