Made changes to the tests and comments based on PR notes
Modified how periods work and removed market_aware condition check