Updated Drawer test