refactoring; minor test code layout tweaks
refactoring; minor test code layout tweaks

cyber-dojo/web,byran/cyber-dojo-web,byran/cyber-dojo-web,byran/cyber-dojo-web,byran/cyber-dojo-web,byran/cyber-dojo-web,byran/cyber-dojo-web,cyber-dojo/web,byran/cyber-dojo-web,byran/cyber-dojo-web,byran/cyber-dojo-web,cyber-dojo/web,cyber-dojo/web