test fix and improvement