Mid-term commit on fix for #7 - Need to complete e2e test to reproduce and validate the fix in the final test