Removed / splitting feature
Fixed tests