Adding copyrights/licenses
Adding test to verify solution to #933 is functional
Improve on the fix submitted yesterday