more test bug fixing