Tweaked package test finding code, now captures even more