Added 2nd part of test#2 implementation