remove #XXX
move_cals_outside_preloaded_check
move_cals_outside_preloaded_check_2
tests
move_cals_outside_preloaded_check_3
make_tests_more_explicit
refactor
Merge pull request #1255 from adykstra/fix_pick_drop_mixin

FIX: pick drop mixin