minor cleanup and additional test