Added tests up to problem 40