Various tweaks
Use vinyl-file for testing