CRAFTERCMS-79, CRAFTERCMS-80, CRAFTERCMS-87

Remove inconsistency with test folders