Adding/cleaning up round tests