tests now run properly
merged latest commit from the Karma branch