Have testing code integrated better