More tests pass, but not all
making manifest look better and pom more similar to src