fixed failing prepare tests