Correctly merge MANIFEST and BND file
Add unit tests