Fix config
Refactor tests
Merge pull request #49 from bem/update-tests

Update tests