cleanup tests a bit

@osheroff 

### Risks
 - None