update to feature with added tests