Added maven test support