Added possibility for testing normal and perl packages