Removed duplication in arrange part of the tests, move NCBI tests to its
own test class