Fixed multiple lib case + tests