Move test set code to separate package