Test reorganisation

As discussed in https://github.com/biocore/bipy/issues/48