updated with test fixed