Restructure tests directory
Implemented lcm