added tests up to 87%