Update test suite thanks to some great help from @qadan