New version and test
Updated manual tests