Rename tests for consistency
Adapt tests