Fix bugs that may arise in real-time testing