Fix failing maven unit tests