Adds tests back
Renames method