Testing changes for #3, #4 and #7.