Moved some tests around, got rid of others and began implementing specs using builders
Changed grunt file to reflect new test paths