Add grunt task for building fixture
Code cleanup
Cleanup tests