Adjust test split as an attempt for consistency

More from issue #267