cleaning up testing code