improve DrawerTest