Break out some more tests into another file
Package updates

& fixed JSCS config (ugh, JSON)