Improves Check setup

Also correctly makes sure lib and bin dirs are included.