595-70 & refining test code