Merging from bleeding
Forgot to uncomment test logic