Add few tests and changes