Add test to MANIFEST and other tweaks