Updates feature-list and changes method names in tests