Updated to conform more with grunt standards

Use src/filesSrc parameters now. Ironed out some more unit tests.