Address denis comments + test timing