Development changes

Fix tests with require.js
Minor fixes