Merge pull request #51 from pisaychuk/master

Changes according to new base test class