some changes to simplify test