Fixed organizational problems in test directories