improvements on test