moved test files + more constraints.