Modified tests directory
Merge fix