CircleCI / Test Improvements

by Alexey Kuvaldin