#1 fixed, test added