copy some attributes that were since added. adds a test that shows threw
an error before (just for testing though)
Merge remote-tracking branch 'remotes/origin/master'