few tests and changes