fixing tests and overall maven build