MX-3 hierarchy change, junit test broke