Solves testing bugs