Updated, added test