Optimise Import
Junit Testing Database