Fix new test structure

Related to #811