Updating tests and call/apply blocks