The new way.
Removed unneeded test.
Fixed tests.
Removed old files.
Moved files around.