clean up and first assertj test on test unit finder