Fixed tests #199