TAMAYA-3: Readded fixed test