/lib into lib
Simplify the testing