Merge spec files in with the source that they test
Update karma.conf for relocation of specs in prior commit