Bump libs
Refactor the test-code