Cleanup (constants)
Test fix