Update vendor files; add phpunit to dev dependencies
Refactor sample selection