Tests refactoring
Tests refactoring - finally works!