Tamas' test change