Added simulator tests