Some work on cleaning up testing and require.js stuff.