reorganised the files to make it easier to add new tests
Merge remote-tracking branch 'upstream/master'
Added testing stuff to JS, still need to get it working