MMARQUES-10: Fix test imports