Added merge tests
Added grunt to automate tests