Split artifact tests into class
Basic support for phase expansion