Up to feature testing

Implemented this change which certainly makes sense!