Add extra testing