Fixed boilerplate test and resultant failures