Another test and minor cleanup