Adding more logic to test