Refactored test to match coding standards