Updated tests and implementation of delay