Add the next test and minor cleanup