Align test directory structure with standard pratice (part 2)