Adding unit tests for the new systematic functionality