Add feature-tests for all previous functional