Some updates to test for 1.6

Hi,

Love your idea and execution so far. I have made some enhancements for you to further test.
I am new to GitHub so let me know if this has to be done differtently in any way.

Best,

David