Removed retain cycle, updated tests