Update tests and cleanup manifests a bit

There are problems testing on Mac OSX due to incompatibilities with concat module.