Improve idle time multiplexing and add additional tests