Discover a bug
Fix depth bug + Add more tests in