Fixed buggy condition
Finished round tests