Add different types of features to pass unit tests