New Version and fixed testing