Adding JSCS testing and fixing issues