Fixes for maven testing