Clean up
Add test directory
Update pom
Add hearders