Fixed the test and package
Sorted out the manifest for correctness