Making test more better