cleaned up testing dir structure