Removing cyclic reference
Improving test description
Oops