More Test Code Clean Ups