Adjust wait times for testing
Add logging for testing