Fixed pop lib and poptest