Puts replaced by tests... was about time