Use maven test dir convention and some test simplifications