Refactored tests to better describe their purpose