WIP: Renamed detection
Updated test cases