Updated doorhandler and its test