rename test; minor cleanup