Working js stuff
Moved test stuff out of  directory for compatibility