move tests out of main package