Refactored test and added another