GPII-113: updated references to renamed files
GPII-113: Jslint'ed the test file
GPII-113: jslinted everything, fixed a code weirdness where I checked for null in conditional expanders