Revert "updated test back to way it was"

This reverts commit c36c9aed6230463c6adab7d7571f2c040e3e2e54.
Revert b8b521b..fb944db

This rolls back to commit b8b521b012b79cb22419938f6a5f675dbff0fadc.
Merge branch 'master' into gh-pages