Un-comment commented-out tests... oops