Pass arguments along

Also provide a simple test file.