loading and parsing tests complete
Merge branch 'almasb'
merge