Upgrade libs
Wasn't using that directory
Fix bad directory name
Move tests to a different directory