Quick cleanup
Tests
Renamed constant