change to new way to handle testFinish
fixing quote problem with atleast and show