Make some test pass (still two that only turn red when full maven build)