More maven steps
Fixup typo from 88c4fdb81aa5fbd34c718ee01401f4aff4c9ea8b
Done porting maven test