Readd feature and updated tests