Added retained tests, and fixed synchronization problem