fixed maven build and tests