WIP: Renamed detection
Updated status() test cases