Progress on setup tests