few tests and updates