test.js updated with more goodies