Modify maven build and add test category