Update Maven build to state of the art
Remove defunct instrumentation test project