gettling close to tests passing
fixing some test tools