fix take and add more tests