Fixes #28
Removing test data
Merge remote-tracking branch 'upstream/master' into firefox