Tests refactored
Tests refactored