Refactor names for consistency
Make test more robust