Fixing boilerplater tests