impreovemens and new tests