Finish adaptation of test suite