Added tests for b3037cdb2302da8579ffd0d663f553bfb476840e.