fixing handler tests