Modify tests to fit new dir structure of library.