Updated test to cope with doubles