Fixed breaking maven unit tests