added initialize test, passes
Merge branch 'master' into mcarthur