Adding structure for tests and better grunt implementation.