Loading tests pass -Shawn