Rearrange test files to support python 3 only tests, because I just added support for function annotations