add MANIFEST fix context irregularity in test and whitespace