issues 10, add additional tests