Add more options to grunt file, structural improvements to test setup