Pull request

Merge tests to master branch