test updates, fix working_time problem