Move tests out to separate package