fixed a couple test
Merge branch 'fix-5-tests' into gh-pages