Fix broken DiamondashServer test
Fix js tests and cleanup the code around the breaking tests
Merge branch 'feature/issue-60-fix-failing-tests' into develop