Fixing method signatures for testing