Updates grunt to 0.4.0, starts to refactor test suite file structure.