Clean-up testing code a little bit