Merged directories for ChompDBTest into one