fixes delay and adds calculator test