Timob 13709 Implemented the other tests