Rectified branches, finalized DLL and tests

There shouldn't be that much whitespace here. If the block below is not related to the block above, you should make it a separate function.