Fix collection of blocks
Allow separate selection of dev and test files