Improving tests and making sure it does not call aws that often