Fixes for powernap tests