split up tests more
Merge branch 'master' of git://github.com/discore/discore-interface into stripe

Conflicts:
	tests/users.js