manifest fixup and unittests

Signed-off-by: Esben Haabendal <esben@haabendal.dk>