[Wip] Remove pry, fix failing test