Fix some tests for faster machine
Merge pull request #13 from edx/ned/fix-some-tests-for-faster-machine

Fix some tests for faster machine