Updates to gruntfile, moving test js files around.