Make test functions private and give them better names