issue 17: updating tests