Added a bit of documentation to the code and rearranged it to reduce time to fail

Removed tests from the grunt setup